From: Kenichi Handa <handa@m17n.org>
Date: Tue, 5 Jan 2010 11:42:19 +0000 (+0900)
Subject: merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8771^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=57c78f24218cf5ca4bb949c33ed444f4f4d1f100;p=emacs.git

merge from trunk
---

57c78f24218cf5ca4bb949c33ed444f4f4d1f100